Updated the api to offer some additional query access