Updated route class design to be better.