Added support for data encryption