Changed implementation to use DispatcherServlet