Fixed client objects generation