Refactor load method