Added Toggle Button Support