Conversion helpers update