Servlet update - to be extended