DATACOUCH-110 - Use CustomConversions for Map/Collection values

This patch fix the mapping issue in DATACOUCH-110.