Foo support changes from 3.x