fixup! EntityContainer integration wip