Better routing for loading code