Changes for framework generations