Updated to Foundation Framework