Make Extractor Behaviour Consistent

Finishes #122