Consolidate into single template