Support for EntitySet merge
fix: build
refactor: CanonicalContainer, DbSchemaFactory