Saga mapping

fixes #2137  and #2136