Merge branch 'issue-12' into 'develop-v2.1.1'

Updated the use of datatype properties for identifiers

Closes #12

See merge request !12
2 jobs for develop-v2.1.1
in 50 seconds, using 0 compute credits, and was queued for 3 seconds