further progress and GSON support is back