Removing use of classes for data types