It should be trivial but we need to make sure we don't use any of the deprecated parts for v3.4.0 and v3.3.0