Update of the Java API implementation
Refactoring of the Java API