Proper API

Do not merge.