Modernized infrastructure