Tweaking the new router api.