Better comment annotations and new api path.