Update Java API.
Refactor.
Refactor.