Changed more parser rules for schema detection.