Refactored keys, use SAs.