Updated discriminator map for entities using new bundle, a few other improvements