Some more constants have been added and a utility method to strip off the query string from the url has been added