Added more haddock documentation