Updated to new framework versions