Fix addKey calls to use new API