Merge "Refactor codes for update ns"