Added the ability to save name and comment to database