More progress system refactoring