Added support for haskell