FIXUP: implement missing API parts