update code
Implement data isolation feature during transition but not enabled yet