Rewrite to allow native java queries.