Updated for lazy loading in v1.0beta6