Improved DefData support.