Improve conversion scripts