Simplified API and updated it to use last apidoc version