Removed extra mapping