Improved Haskell support