Change Add... expressions to use server-side conversion