Improve JD demo scenario