Thailand targets infrastructure, manufacturing upgrades