@erichelgeson any other way besides multi tenant as that involves adding a discriminator column to existing entities ?