Updating the API to the new API

JAVA-1325
No we have a registry we can now, can't we?