Reconfigured to use parent class Filestore