Upgraded for upcoming system support