Refs #18
New query interface