are we planning on adding these to Address__c?