Revised route class design