Before code reorganization and Foundation update