Refactor and add VO query support