Refactoring TransferHandlers, fix