Add all remaining query functions