Updating the API to the new API

JAVA-1325
Needs  tests for getCollection overloads