Add non-generic GetEntityMap, GetEntitySet