Updated so as to reflect new config params