Improve overwrite behavior