Add extraction of data validations