added join to dao