exports changed for haddock