updated data types to align more closely with unicode support