Added more Haddock