Structural changes to the basic multi-template enrollment operation