Updated the saving workflow - now passes through XPathsHandler for saving client input