Adapt interface changes in upperio