Path modifications according to v2.0