Rework global objects access