Added encryption client side