Added tables and eqs