Updating the API to the new API

JAVA-1325
Added a ticket to address in the future because of the above - so marking done