Allow passing identifiers via factory
Merge branch 'hotfix/identifiers'