Refactor (again), added LazyInitialization trap
Merge remote-tracking branch 'origin'