Upgraded to match the latest framework.