Fix extractor.
Make distributions more flexible.