Issue 3: Refactor logic in Activator