Update code pieces so they are valid in v3.0.0