Some structural improvements