Tweak: use hasOption() in PopulateCommand instead of checking for booleans