Collapse lines
Add ContainerAwareRouter