Improve example EDA