Add dedicate QueryHandler class