Updated cabal file
Refactor to record syntax