Changes to framework backend