Refactor internal load