Core v3.1 - More and more structured code.