some improvements
save clients in a Map