add new models and clients
fixed merged