Additional support for Haskell added