Follow internal changes

TODO: remove or warn old interfaces