Added standalone option