More changes for Foundation