Added partial load option