Add routing + corrections