Consolidating jsons and code to single WFS