Activation refactoring