fixed entities mapping