Use new framework