Progress plugin
Some Refactors