Fixing the parser and the metadata objects
Fixing the parser and the metadata objects