Updated FileStore to accept Reader source