Work on value parsers

Change-Id: I0738039e35e729b8adc674156e8649a8e1a2a5e0
Merge "Work on value parsers"