Refactored to use add/remove for features