Enhanced KeyMaster and introduced Cryptographer as skeleton.