Adding changes to framework