Reverted back to routeProvider