Updated the load method