Added haskell support again