Supported more datatypes