Safer key handling, further processing of add-on perf