Parsing refactory