KeyStorage compilation

Jira Issue: WP-888