First set of changes to migrate to foundation 4