Made a few changes to framework