Reordering annotation and source arguments
Removing pbcoreIdentifier from the template