Added to CharacterLib and Core