API updated to allow loading in parts / lazy load