Created KeyManager and KeyList. These should work.
Merge origin/master