Update base parser to include new objects
Bugfix in parser and spec