Updated Saga implementation