added support for lazy loaded collections