Added Foundation 4 support