[NUCCORE-1238] More separation of update from basic wrapping process,
and split creation of the wrapper into its own method