Factor out data types