Further refinements to the structure