Extractor implementation and test.
Model improvements.
Test data addition.