add enabled/disable support