EntityContainer integration wip