Partial update to 3.0 syntax