@cmorse You can change these to use the static clone functions.