Added options to parser and correctly building routes