Working on multi-tenant keys.
Fixing multi-tenant enumeration and adding key list scheme.