Convert statements to new format