Added QueryCommandHandler