Added additional data types.