Foundational 3.0 code changes