Aded support for generating non base64 encoded hashes
Handling of non-values