Performance improvements in conversion