Move parser to utility module