Added support for rudimentary module query actions