Add support for enable/disable methods and move callback