Begin adding support for other data types.