Updated command line defaults utilities