Update to Foundation 4 Framework