Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
unnecessary code repetition could, you could only store module name here the rest of code is the same as for create map