Add cross-field constraints