Adding basic saga support