Try to support diff cell templates
Add cell templates support