Optimize data-type more correctly