Change method signature in API
Javadoc and refine some method names.