Updated parser to output a hash, not an array (more semantic, easier to refer to elements later on)