Switch to new framework