Reconfigured to to use parent class Filestore