Handle commands with arguments for #6