Add command line args and make keys unique