Added Haskell support