Adding explicit @ and / requirement for all usages of <scope>