Participant refactor, added AddressType