Added changes to the framework