Design advances of the Core Plasma Thomson Scattering diagnostic for ITER