Move to the new framework