Moved the logic from Activator up to the SCM project