Added support for Haskell