Enhance support for Fortran
Enhance support for Haskell