Added enable/disable methods