20141210 - Added more descriptors