Upgraded support library