Added map implementation