Added data converted. Refactored client.