Loading process refactored