Refactored service queris