Rewriting the parsing logic for the webserver.