Change the supported data types to make more sense with the current state of things