Started adding haskell support