Refactor ProgressAdapter