20141207 - Added more descriptors