Implement proper enable/disable for some features