add support for new transfers api, needs cleaning