Update to new framework properly