refactored Model Query elements