Added data table and template