reworked Validate module