Substantial update of the architecture