Add 'dependent' validations and formatting