Add key storage support