Add MOAR validations