Move loading to partial