Rework routing, put in more raw data