added cli key=value functionality