Updates needed after encapsulation and harmonizing operators for LayoutLength