change DB and gson structure