Secure storage support
Fixed typos