Complete Refactoring of the Route Plugin