Updating elements to support more fields + changing Ximdex host