Service instance

Use pointers rather than references for the map... It makes the data ownership model simpler to understand.