Camino object replaces Router, internal changes for efficiency