add load to getters
Merge branch 'origin/feature_lazy_load'