Re-arranging and adding of template support