Improved Infrastructure Quotes