Improvement on DAX support.