20141116 - Added more descriptors