DELTASPIKE-523 unified structure