Added map parsing