Split Update and Save Handlers