Moved some charm stuff to Hero_Charm