Added fields to theses and user and added join method