Added logic for querying for module
Autocommit Mon Dec 08 11:30:52 EST 2014