Changed objects to load in pre-init