add support for switches and indicators