Added structuring