prepared new method getMap() for each message. Cleanup