Support 'include' in queries