Added list and query functions