Improved data types