Changed visibility classes
Merge pull request #5923 from andy-saint/global

Improved global visibility classes