Added flag for non-standalone