Updated to Foundation 5