Added validation to modules