added support for new datatypes