keyStorage enhancements + keyStorage comment