Lazy connection loading. v2.1.0