MOB-1780

**DO NOT MERGE YET**
Maybe `mapId` is a good idea here ? :pray: