Add emit on indentification