Commandline revamp to have all arguments