20141003 - Added more descriptors to encryption