EntityContainer implementation fix