Add back type conversion