Update to extract structural IDs