20141130 - Added more descriptors