Refactor and define parser group