20141205 - Added more descriptors