Added custom unitSwitch and methods for default state overwritten
added custom unitSwitch and methods for default state overwritten