Updated load method