Refactor vmrun_completion and add additional commands