Further improvements of the Framework