Better parser

Better organization for the hash created by the parser