Updating the API to the new API

JAVA-1325
:) Changed..