Features/router integration