Verious changes for new framework.