Complete upgrade to MagicalRecord