new support for key handling