Refactoring TransferHandlers