Added flag to disable proxy