Refactored client data module