Add original conversion code