added support for enable/disable functions