Moved Charms, Combos and Spells into Models