Updated WhoCommand