Library updates to support saving multiple reports