OR-415 Add additional identifier types