Add missing validations and column constraints