Combined and Refactored Party and CharacterParty