Updated simple data types and objects