Refactor contact attributes into foundry