Changes to remove the hardcoding of ApiDocumenter