Continued WIP API improvements