Updated type conversion