Added complete new version of the framework.