Refactored ProcedureQueries