Adapt exported funcs and types