[WIP] Adding handling for cryptography