Feature/add client model