Renamed event control function from add/remove to enable/disable