Charm and Beauty definitions updated