Version update
Added 1.0.4 changes
Lightweight extraction
Removed extraction/serialization