Framework Changes

Updated all relevant code as a result of the changes to the framework.