Add surround template functionality