progress tables refactoring