Change derived variables order to include changes from command line arguments