Improve the load methods