Further work on grabbing identifiers