ADD support of naked-key