Changed API so that it is easier to not fill the client collection.