20141109 - Added more descriptors