Added tables and templates