HACK - Add support for CustomDataType responses (bug fix - CachedMap covered it in local mode)