DC/Pooja | #3071 | Refactoring project save