Added validation for modules