Improve data types