Updated the servlet structure