Structured motifs added