More work on adding identifiers