Adapt to version 2 of FOS