Working on the docs and new APIs