20141110 - Added more descriptors