Changes for servlet and front end