Preparing for new framework