Changes for new framework