update with so many new enhancements - pagination, slow dump, etc