Issue 3: Upgrade to Foundation 5