Phase out depend on CB, use GSON directly