update object loading logic