Updated load methods