Added logic for querying for module
Autocommit Mon Dec 08 11:31:51 EST 2014