Add validations for modules

Just a belt and braces exercise