Beginning of changes for data types