Updated cabal definitions to make building easier