Add code to handle versioned delivery