Adding some changes to framework and js