#20: CommandSender and GroovySender updated