Merge "Refactor codes for term ns"