Moved from ServletContextAware to Autowiring