Added support for various additional datatypes.