added join fetch