Migration to foundation 4
Migration complete to foundation v4
Few improvements
Fix typo