Add enable/disable support