Load method was changed