Changes for foundation 4