Improve cabal parser