Added @Scope annotations