Added some extra parser helpers