Improved GlobalData classes (fixed what I started before the last commit).