General updates of the new framework.