Added NoteFactory