Make accessor based querying optional, refs #18