Move problem save into handler