Updated conversion template