Activation logic moved to separate class.