Upgraded to support Servlet 3.0 Api and use of Annotation