Moved properties loading to Global