Improved argument list definition
Refactored assignment definition
Added hashes to parser