- Extracted customQueries to a new class