Added support for enable/disable