Updated the api to offer some additional query access
Adding back the critical instrumentation step...