Support for custom storage class and encryption method. #105