Added the missing parser
Minor refactor