Upgraded support lib