Added Entity Map