Add support for more Haskell entities