Changing back to use TypeDescriptor