#1 moved Activator to common for easier testing