Add explicit param option to CLI
Move key value list logic into separate action