Added Enable and Disable methods