Tunned the query and session to enable lazy load