Tweaking parser to handle absence of fields