Restructure cell generation, add change value handler