To update removal of global var usage