Updates to original framework files