Added config changes for phase 3