Added haddock API