Added enable and disable methods