Imporve types highlighting