Architecture changes to support modification of form template.
Principal getAddress to return email/phone details.