Updated to latest Foundation version