Add version chaining support