Refactoring and applying proxyplugin