re-org DniKeyHandler