Move the query execution into QueryRunner