diff --git a/script/create_example.pl b/script/create_example.pl
index 2b69a4f..a532bcf 100755
--- a/script/create_example.pl
+++ b/script/create_example.pl
@@ -6,7 +6,16 @@
 
 my $dir = $FindBin::Bin;
 
-foreach my $file (qw/00001 00002 00003 00004 00005 00006 02035-substring 02439 05663-unbalanced 07452-deep/) {
+foreach my $file (qw/00001
+		     00002
+		     00003
+		     00004
+		     00005
+		     00006
+		     02035-substring
+		     02439
+		     05663-unbalanced
+		     07452-deep/) {
     my $call = 'perl ' . $dir . '/prepare_index.pl -i ' . $dir . '/../examples/WPD/AAA/' . $file . ' -o ' . $dir . '/../' . $file . '.json';
     print 'Create ' . $file . ".json\n";
     system($call);
diff --git a/script/prepare_index.pl b/script/prepare_index.pl
index fd2d45a..6d8611d 100644
--- a/script/prepare_index.pl
+++ b/script/prepare_index.pl
@@ -129,9 +129,13 @@
 push(@layers, ['OpenNLP', 'Sentences']);
 
 # CoreNLP
-push(@layers, ['CoreNLP', 'NamedEntities', 'ne_dewac_175m_600']);
-push(@layers, ['CoreNLP', 'NamedEntities', 'ne_hgc_175m_600']);
+push(@layers, ['CoreNLP', 'NamedEntities']);
 push(@layers, ['CoreNLP', 'Sentences']);
+push(@layers, ['CoreNLP', 'Morpho']);
+push(@layers, ['CoreNLP', 'Constituency']);
+
+# Glemm
+push(@layers, ['Glemm', 'Morpho']);
 
 # Connexor
 push(@layers, ['Connexor', 'Morpho']);
@@ -145,13 +149,13 @@
 
 # Mate
 push(@layers, ['Mate', 'Morpho']);
-push(@layers, ['Mate', 'Dependency']);
+# push(@layers, ['Mate', 'Dependency']);
 
 # XIP
 push(@layers, ['XIP', 'Morpho']);
 push(@layers, ['XIP', 'Constituency']);
-push(@layers, ['XIP', 'Dependency']);
 push(@layers, ['XIP', 'Sentences']);
+# push(@layers, ['XIP', 'Dependency']);
 
 
 if ($skip{'#all'}) {