Major changes to framework