added query executor and version support