Upgraded FoundationKit