Re-added custom route, fixes app explosion, new route context