Refactoring individual and policy parsers