Split save into create and update