beefing up base entity collections