Add missing validations