Issue #376

Lazy loading completed and tested.