Progress on 3.0 syntax update