Moving globals to build [ci skip]