Switch to using objects for IdP / SP entity metadata