Added key handling capabilities