Added structs and code for mapping raw data types.