Update with new APP_URI feature