Switched to mapping data

Removed cleartext in favor of mapped hashes