Overhaul Map and added Entity