More structural improvements