Improved data type handling.