Progress on MLE support