Updated Load method