Partial 3.0 syntax update