Adding overwrite checks