Added overwrite flag