Changes for Foundation 4