Changed some object loading things