Finished map implementation