Client: Refactored code for integrated last changes on Collection API.