Refactor to use TransferItem from common.