Added standalone check for v1