Entity set/get improvements