Changed to null_store locally