[wip] API changes

Preparing a few API changes