1. Address review comment.
2. Add unit test.