Added simulated switch and contact sensor