updated to directly reference the Filestore class