Update to Foundation 5