made the filestore more versatile