Improve Doc2Map mapping and fix problem is DataSense for nested complex types