Added overwrite protection