Add force override option
Refactoring script