More global data moved to globals infrasturcture.