Added name saving