Extracted enum for partnership type
Misc source update