add calculated columns