Implement some changes to framework