more imports from upcoming version