Added CLI Query Runner