Better organized data types