Upgrade of Usecase1 to use joined query instead of building join structure with objects