Improved robustness of the Clients. Added a few classes for handling
data.