parsing methods moved to new parser class