Fix adding datamaps