Datastore dev, fixed group and and added topic