Updated dictionary and client model