Added functions to framework