Improve Haddock