Migrated to Servlet 3.0 annotations