DELTASPIKE-288 improved api