Add parsing of primative data types