Added a few more query mechanisms