Merged MagicModel and CharmsModel