Added better Haskell support