Added more logic to subclass parsers