Use new data types