Added map (v2, so I need to upgrade it).