Adjust to latest framework version