Update validations to match DB schema