Move query/apply methods to their own director