Modules

Add additional validation checks