Further developed parsing functionality