[WIP] Api improvements