Adopted apidoc changes