Update internal API
Update documentation