Method setUpTables added, other changes