Add saga support