Added negotiation table and more tables