Add enable/disable feature