added Parsing functionality