update the client model to work with generator
update the client model to work with generator