Update to new version of framework