Added support for custom dataTypes