Modified the application context to avoid using @Qualifier