Added haskell support