Adapt to reflect most recent changes in fog for fog-core