Migration to Foundation framework