Redesigned route based on entities