Added by-id clients
Added Encryption module