Modifications for 1.0.4
Lightweight extractors
Removed serialization/extraction