Intermediate update to sync with xbrowse lib