Update to new Framework versions