Add MFFS and CalclaviaCore.