update
Improve object loading