Modified servlets to work with database changes