Johan Bilien

@yincrash that's a pretty good solution, but that means we need to maintain the list of keys in 2 places