[WFCORE-205] Use a sorted map for storing the client content