Added data types to parsers