DCAE APP simulator rework