Further work on datamap handling