Extracted EntityHandler and NoteEntityHandler