Add local file store
clean up connection store