Updating the interfaces for features and toggles which should provide more flexibility