Smooth transition to newer versions