Check in refactoring for adding Process Optimizer