Simplify activation and deactivation