Better routing system and documentation