Added enable/disable support