More refactoring of the transfer API / implementations
More updates to the transfer APIs