Simplify Container class.