Updated motifs classification to work