Extracted some queries from the service layer