Changes to framework