Added switch and action capabilities