Performance improvements to entityContainer