Upgraded various requirements