Added enable/disable functionality