added Label, comment field to save