Implement credential and verification storage
Fix merge conflict