add keys to KeyResolver and Manager fixes