20140930 - Added more descriptors to encryption