Refactored EntityMap a bit