Added enable/disable functions