Added haddock comments