restructured generation of client data