Simplifying filestore.