Added some parsing functions