Functionality added to allow saving of names