Added a check for Modules