Restructured the data types a bit