Added overwrite feature