Large number of improvements to the framework