Refactoring - use lazyLoading