Added Foundation Changes to Framework