Improving defaults and Encrypt.class usage.