First draft of the multi-credential transfer support