Yes, this is also one of my concern, we need to have a stand alone wallet that we can keep on our PC, for the sake of security this should be prioritize too.