Added overwrite check