Started working on router utils for modularization