Fixed load order and global classes