adapt to the new fog-core schema