Added enable/disable feature.