Add join table and user authentication