20140922 - Added more descriptors to encryption