refactor client model init and create Model::unbundle