diff --git a/Changes b/Changes
index 0dd786d..7e4f606 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+0.23 2016-10-27
+        - Added wildcard support for document extraction
+
 0.22 2016-10-26
         - Added support for document extraction
         - Fixed archive naming
diff --git a/Readme.pod b/Readme.pod
index 2ee0d7b..59253e7 100644
--- a/Readme.pod
+++ b/Readme.pod
@@ -4,308 +4,68 @@
 
 =head1 NAME
 
-korapxml2krill - Merge KorapXML data and create Krill documents
+KorAP::XML::Krill - Preprocess KorAP XML documents for Krill
 
 
 =head1 SYNOPSIS
 
-  korapxml2krill [archive|extract] --input <directory|archive> [options]
+  # Create Converter Object
+  my $doc = KorAP::XML::Krill->new(
+    path => 'mydoc-1/'
+  );
+
+  # Convert to krill json
+  print $doc->parse->tokenize->annotate('Mate', 'Morpho')->to_json;
+
 
 =head1 DESCRIPTION
 
-L<KorAP::XML::Krill> is a library to convert KorAP-XML documents to files
-compatible with the L<Krill|https://github.com/KorAP/Krill> indexer.
-The C<korapxml2krill> command line tool is a simple wrapper to the library.
+Parse the primary and meta data of a KorAP-XML document.
 
 
-=head1 INSTALLATION
+=head1 ATTRIBUTES
 
-The preferred way to install L<KorAP::XML::Krill> is to use L<cpanm|App::cpanminus>.
+=head2 log
 
-  $ cpanm https://github.com/KorAP/KorAP-XML-Krill.git
+L<Log::Log4perl> object for logging.
 
-In case everything went well, the C<korapxml2krill> tool will
-be available on your command line immediately.
-Minimum requirement for L<KorAP::XML::Krill> is Perl 5.14.
-In addition to work with zip archives, the C<unzip> tool needs to be present.
+=head2 path
 
-=head1 ARGUMENTS
+  $doc->path("example-004/");
+  print $doc->path;
 
-  $ korapxml2krill -z --input <directory> --output <filename>
+The path of the document.
 
-Without arguments, C<korapxml2krill> converts a directory of a single KorAP-XML document.
-Expects the input to point to the text level folder.
 
-=over 2
+=head2 primary
 
-=item B<archive>
+  print $doc->primary->data(0,20);
 
-  $ korapxml2krill archive -z --input <directory|archive> --output <directory>
+The L<KorAP::XML::Document::Primary> object containing the primary data.
 
-Converts an archive of KorAP-XML documents. Expects a directory
-(pointing to the text level folder) or one or more zip files as input.
 
-=item B<extract>
+=head1 METHODS
 
-  $ korapxml2krill extract --input <archive> --output <directory> --sigle <SIGLE>
+=head2 annotate
 
-Extracts KorAP-XML documents from a zip file.
+  $doc->annotate('Mate', 'Morpho');
 
-=back
+Add annotation layer to conversion process.
 
 
-=head1 OPTIONS
+=head2 parse
 
-=over 2
+  $doc = $doc->parse;
 
-=item B<--input|-i> <directory|zip file>
+Run the meta parsing process of the document.
 
-Directory or zip file(s) of documents to convert.
 
-Without arguments, C<korapxml2krill> expects a folder of a single KorAP-XML
-document, while C<archive> and C<extract> support zip files as well.
+=head2 tokenize
 
-C<archive> supports multiple input zip files with the constraint,
-that the first archive listed contains all primary data files
-and all meta data files.
+  $doc = $doc->tokenize('OpenNLP', 'Tokens');
 
-  -i file/news.zip -i file/news.malt.zip -i "#file/news.tt.zip"
-
-(The directory structure follows the base directory format,
-that may include a C<.> root folder.
-In this case further archives lacking a C<.> root folder
-need to be passed with a hash sign in front of the archive's name.
-This may require to quote the parameter.)
-
-To support zip files, a version of C<unzip> needs to be installed that is
-compatible with the archive file.
-
-B<The root folder switch using the hash sign is experimental and
-may vanish in future versions.>
-
-=item B<--output|-o> <directory|file>
-
-Output folder for archive processing or
-document name for single output (optional),
-writes to C<STDOUT> by default
-(in case C<output> is not mandatory due to further options).
-
-=item B<--overwrite|-w>
-
-Overwrite files that already exist.
-
-=item B<--token|-t> <foundry>[#<file>]
-
-Define the default tokenization by specifying
-the name of the foundry and optionally the name
-of the layer-file. Defaults to C<OpenNLP#tokens>.
-
-=item B<--skip|-s> <foundry>[#<layer>]
-
-Skip specific annotations by specifying the foundry
-(and optionally the layer with a C<#>-prefix),
-e.g. C<Mate> or C<Mate#Morpho>. Alternatively you can skip C<#ALL>.
-Can be set multiple times.
-
-=item B<--anno|-a> <foundry>#<layer>
-
-Convert specific annotations by specifying the foundry
-(and optionally the layer with a C<#>-prefix),
-e.g. C<Mate> or C<Mate#Morpho>.
-Can be set multiple times.
-
-=item B<--primary|-p>
-
-Output primary data or not. Defaults to C<true>.
-Can be flagged using C<--no-primary> as well.
-This is I<deprecated>.
-
-=item B<--jobs|-j>
-
-Define the number of concurrent jobs in seperated forks
-for archive processing.
-Defaults to C<0> (everything runs in a single process).
-This is I<experimental>.
-
-=item B<--meta|-m>
-
-Define the metadata parser to use. Defaults to C<I5>.
-Metadata parsers can be defined in the C<KorAP::XML::Meta> namespace.
-This is I<experimental>.
-
-=item B<--pretty|-y>
-
-Pretty print JSON output. Defaults to C<false>.
-This is I<deprecated>.
-
-=item B<--gzip|-z>
-
-Compress the output.
-Expects a defined C<output> file in single processing.
-
-=item B<--cache|-c>
-
-File to mmap a cache (using L<Cache::FastMmap>).
-Defaults to C<korapxml2krill.cache> in the calling directory.
-
-=item B<--cache-size|-cs>
-
-Size of the cache. Defaults to C<50m>.
-
-=item B<--cache-init|-ci>
-
-Initialize cache file.
-Can be flagged using C<--no-cache-init> as well.
-Defaults to C<true>.
-
-=item B<--cache-delete|-cd>
-
-Delete cache file after processing.
-Can be flagged using C<--no-cache-delete> as well.
-Defaults to C<true>.
-
-=item B<--sigle|-sg>
-
-Extract the given texts.
-Can be set multiple times.
-I<Currently only supported on C<extract>.>
-Sigles have the structure C<Corpus>/C<Document>/C<Text>.
-In case the C<Text> path is omitted, the whole document will be extracted.
-
-=item B<--log|-l>
-
-The L<Log4perl> log level, defaults to C<ERROR>.
-
-=item B<--help|-h>
-
-Print this document.
-
-=item B<--version|-v>
-
-Print version information.
-
-=back
-
-=head1 ANNOTATION SUPPORT
-
-L<KorAP::XML::Krill> has built-in importer for some annotation foundries and layers
-developed in the KorAP project that are part of the KorAP preprocessing pipeline.
-The base foundry with paragraphs, sentences, and the text element are mandatory for
-L<Krill|https://github.com/KorAP/Krill>.
-
-=over 2
-
-=item B<Base>
-
-=over 4
-
-=item #Paragraphs
-
-=item #Sentences
-
-=back
-
-=item B<Connexor>
-
-=over 4
-
-=item #Morpho
-
-=item #Phrase
-
-=item #Sentences
-
-=item #Syntax
-
-=back
-
-=item B<CoreNLP>
-
-=over 4
-
-=item #Constituency
-
-=item #Morpho
-
-=item #NamedEntities
-
-=item #Sentences
-
-=back
-
-=item B<DeReKo>
-
-=over 4
-
-=item #Structure
-
-=back
-
-=item B<Glemm>
-
-=over 4
-
-=item #Morpho
-
-=back
-
-=item B<Mate>
-
-=over 4
-
-=item #Dependency
-
-=item #Morpho
-
-=back
-
-=item B<OpenNLP>
-
-=over 4
-
-=item #Morpho
-
-=item #Sentences
-
-=back
-
-=item B<Sgbr>
-
-=over 4
-
-=item #Lemma
-
-=item #Morpho
-
-=back
-
-=item B<TreeTagger>
-
-=over 4
-
-=item #Morpho
-
-=item #Sentences
-
-=back
-
-=item B<XIP>
-
-=over 4
-
-=item #Constituency
-
-=item #Morpho
-
-=item #Sentences
-
-=back
-
-=back
+Accept the tokenization based on a given foundry and a given layer.
 
-More importers are in preparation.
-New annotation importers can be defined in the C<KorAP::XML::Annotation> namespace.
-See the built-in annotation importers as examples.
 
 =head1 AVAILABILITY
 
@@ -315,17 +75,19 @@
 =head1 COPYRIGHT AND LICENSE
 
 Copyright (C) 2015-2016, L<IDS Mannheim|http://www.ids-mannheim.de/>
-
 Author: L<Nils Diewald|http://nils-diewald.de/>
-Contributor: Eliza Margaretha
 
-L<KorAP::XML::Krill> is developed as part of the L<KorAP|http://korap.ids-mannheim.de/>
+KorAP::XML::Krill is developed as part of the
+L<KorAP|http://korap.ids-mannheim.de/>
 Corpus Analysis Platform at the
 L<Institute for the German Language (IDS)|http://ids-mannheim.de/>,
 member of the
-L<Leibniz-Gemeinschaft|http://www.leibniz-gemeinschaft.de/en/about-us/leibniz-competition/projekte-2011/2011-funding-line-2/>.
+L<Leibniz-Gemeinschaft|http://www.leibniz-gemeinschaft.de/en/about-us/leibniz-competition/projekte-2011/2011-funding-line-2/>
+and supported by the L<KobRA|http://www.kobra.tu-dortmund.de> project,
+funded by the
+L<Federal Ministry of Education and Research (BMBF)|http://www.bmbf.de/en/>.
 
-This program is free software published under the
+KorAP::XML::Krill is free software published under the
 L<BSD-2 License|https://raw.githubusercontent.com/KorAP/KorAP-XML-Krill/master/LICENSE>.
 
 =cut
diff --git a/lib/KorAP/XML/Archive.pm b/lib/KorAP/XML/Archive.pm
index 17a4f53..714e876 100644
--- a/lib/KorAP/XML/Archive.pm
+++ b/lib/KorAP/XML/Archive.pm
@@ -174,8 +174,15 @@
       $first = 0;
     };
 
-    # With prefix
-    push @breadcrumbs, $doc, '*';
+    # With wildcard
+    if (index($doc, '*') > 0) {
+      push @breadcrumbs, $doc;
+    }
+
+    # As a folder sigle
+    else {
+      push @breadcrumbs, $doc, '*';
+    }
 
     push(@cmd, join('/', @breadcrumbs));
 
diff --git a/lib/KorAP/XML/Krill.pm b/lib/KorAP/XML/Krill.pm
index 6ba77db..968d3d9 100644
--- a/lib/KorAP/XML/Krill.pm
+++ b/lib/KorAP/XML/Krill.pm
@@ -15,7 +15,7 @@
 use Data::Dumper;
 use File::Spec::Functions qw/catdir catfile catpath splitdir splitpath rel2abs/;
 
-our $VERSION = '0.22';
+our $VERSION = '0.23';
 
 has 'path';
 has [qw/text_sigle doc_sigle corpus_sigle/];
diff --git a/script/korapxml2krill b/script/korapxml2krill
index 6a2a555..1a418af 100644
--- a/script/korapxml2krill
+++ b/script/korapxml2krill
@@ -73,9 +73,11 @@
 # 2016/10/24
 # - Added support for document extraction
 #
+# 1016/10/27
+# - Added wildcard support for document extraction
 # ----------------------------------------------------------
 
-our $LAST_CHANGE = '2016/10/24';
+our $LAST_CHANGE = '2016/10/27';
 our $LOCAL = $FindBin::Bin;
 our $VERSION_MSG = <<"VERSION";
 Version $KorAP::XML::Krill::VERSION - diewald\@ids-mannheim.de - $LAST_CHANGE
@@ -572,6 +574,7 @@
 
   korapxml2krill [archive|extract] --input <directory|archive> [options]
 
+
 =head1 DESCRIPTION
 
 L<KorAP::XML::Krill> is a library to convert KorAP-XML documents to files
@@ -595,7 +598,7 @@
   $ korapxml2krill -z --input <directory> --output <filename>
 
 Without arguments, C<korapxml2krill> converts a directory of a single KorAP-XML document.
-Expects the input to point to the text level folder.
+It expects the input to point to the text level folder.
 
 =over 2
 
@@ -603,8 +606,8 @@
 
   $ korapxml2krill archive -z --input <directory|archive> --output <directory>
 
-Converts an archive of KorAP-XML documents. Expects a directory
-(pointing to the text level folder) or one or more zip files as input.
+Converts an archive of KorAP-XML documents. It expects a directory
+(pointing to the corpus level folder) or one or more zip files as input.
 
 =item B<extract>
 
@@ -732,6 +735,7 @@
 I<Currently only supported on C<extract>.>
 Sigles have the structure C<Corpus>/C<Document>/C<Text>.
 In case the C<Text> path is omitted, the whole document will be extracted.
+On the document level, the postfix wildcard C<*> is supported.
 
 =item B<--log|-l>
 
diff --git a/t/script/extract.t b/t/script/extract.t
index 8dc2b98..4e633e4 100644
--- a/t/script/extract.t
+++ b/t/script/extract.t
@@ -140,6 +140,48 @@
 ok(-d catdir($output2, 'REI', 'BNG', '00128'), 'Directory created');
 ok(!-d catdir($output2, 'REI', 'RBR', '00610'), 'Directory not created');
 
+
+# Test with document sigle
+$output2 = undef;
+$output2 = tempdir(CLEANUP => 1);
+
+$call = join(
+  ' ',
+  'perl', $script,
+  'extract',
+  '--input' => $input_rei,
+  '--output' => $output2,
+  '-sg' => 'REI/BN*'
+);
+
+# Test with sigle
+stdout_like(
+  sub {
+    system($call);
+  },
+  qr!REI/BN\* extracted!s,
+  $call
+);
+
+# Test with sigle
+stdout_unlike(
+  sub {
+    system($call);
+  },
+  qr!REI/RBR extracted!s,
+  $call
+);
+
+ok(-d catdir($output2, 'REI', 'BNG', '00071'), 'Directory created');
+ok(-d catdir($output2, 'REI', 'BNG', '00128'), 'Directory created');
+ok(!-d catdir($output2, 'REI', 'RBR', '00610'), 'Directory not created');
+
+
+
+
+
+
+
 # Check multiple archives
 $output = tempdir(CLEANUP => 1);
 ok(-d $output, 'Output directory exists');