Change value Extraction to a generic extractor (with regexp)
Improve code
Add test
Improve code