Updated handling of transfer objects