Added async querying