First set of changes to Framework