Refactor object loading process.