Updated data types