Added Foundation 5 support