Refactoring, separating transfer plugins a little.