Add overwrite option for cleaner implementation and better perf